* xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection

from 1.233 so that strings from ENCODE_UTF_8 isn't GC:ed before used.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6f2e3cb432f61c370ed9a5d6c488ecaa9651cb15..2d914eec6f3a204ffae1bbe0350bb6eb48445492 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-27  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
+       * xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection
+       from 1.233 so that strings from ENCODE_UTF_8 isn't GC:ed before used.
+
        * gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when
        tool bar items is 0.
 

diff --git a/src/xmenu.c b/src/xmenu.c
index 473e29de88d37e0e5f39b9bd244c02ad0afe0c66..7ef0e8c857db7ed1e1361d08596097866dd14e23 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1930,6 +1930,7 @@ set_frame_menubar (f, first_time, deep_p)
       FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
 
       items = FRAME_MENU_BAR_ITEMS (f);
+      inhibit_garbage_collection ();
 
       /* Save the frame's previous menu bar contents data.  */
       if (previous_menu_items_used)